Pulled simple getters/setters to header