Improved drinks grammar