Added cheerio and commander