simplify adding of new types to the model factory; this change also means that the ID will no longer have to be duplicated