Added Setters and Getters