Data Model changed, performance optimization