Adding more getters, fixing dependency conflict