Added further known property types
Fixed detection of correct datatype and globe
Minor syntax beautification