Call validator directly where appropriate