Migrations improvement