Adding unique key feature