Upgraded mojito and mojito-cli