Removed Item object, refactored some ModelFactory stuff