Renamed some other attributes to properties