Data model optimization

shape