Change factories and specs for new models