Added a new property loader and test
Changed implementation of property loader to support property overriding