Feature/validator context