Added support for validation