Add index and uniqueness