Added back some getters/setters