Added support for multiple drink selectors