Updated migration and template