Changed to use properties