Feanil/migrations with workaround