Introduce validation groups and fix configuration