Added distinction between object and datatype properties