Updated migration to make them work correctly