Add migration and correct some models and fields