Added getter/setter props to some of fields