Updated properties getters and setters