Added setters and getters for model properties