add support for validation