Move identification uuid out of options