Add PropertyHandler and used it at some points to clarify the usage.