Added Some Getters/Setters