Added More Getters and Setters