Converted some fields to properties