Added code for Property Management