SCHEMA-3. Implement composite entity Ids.

Code review for @kimballa