Added some more getters etc.