Added getters to data structures