Added some getters/setters