Added FixedModelEntity, MaterialCollectionItem and other changes needed for GSoC