Updated classes to use properties