updated migration and models