Added Getters and Setters & added new functions