Improvements to make getProperty method more consistent across all the classes