Added variables and setter and getters