Update validators to conform with refactored design (fails test-suite)