Jarv/migrate changes