Better management of multiple options