Joi 2.0

Closes #1132