Removed long ids and replaced with composite ids