Added new getters to state