Renamed fields into properties