Added getters and setters for properties