Changed mappedTo reference to map
New property metadata class