Adding unique_key optimizer