Add composite primary keys

Change-Id: Ib9247e0dbd70d8509b445efd89d8fdcc1693712c