Added PropertyHandler
Work