Moved the creation of the PropertyHandler for reusability