Optimize Model Properties

Optimize Model Properties#

TODO