Getters and Setters completed