Add support for validation contexts