Update setup utility to add unique keys