Optimize Data model

Optimize Data model