I will try the new migration tools to look what i will get from it.
Any chance that you're working on a Postgres version?