Fix factory model