Added support for Joi