Fixed migrating methods completely