issue#61 Adding property handler classes