keys optimized & data model improved