Updating validation approach to use Joi