Removed SimpleType, moved default object logic into types