fixes migration and organization model