updated import with first_or_create