Added Setter and Getters