Added composite unique key