Added getters.
Refined getter code.