add Joi, Boom and associated changes