Improve property system