SCHEMA-3. Implement composite entity Ids.

After redesign. @kimballa