Added ItemCreator and type loading