Add accessors for properties and use instead

Add accessors for properties and use instead