changes to support mojito-shaker