Fix tray uniqueness error, and allow options to be added.