Add support for validation group