Add migration and fix imports