Re-factored code for loading of properties