Added variables and getters/setters