Updated migration to fit new DB schema