Cocktail api improvement