First migration and fix model bug