Added getters for collections.
Fixed minor naming issue