Refactor for SVY-6999 : Refactor a few small things related to property
types; move code in property type as much as possible