Added getters in factory