Renamed mapping to properties