Fixed migration and relations..