Converted most of the fields to properties