Getters/Setters updated