Improve class getters
Minor update