Improve performance based on new property system