Validation state logic should use interface types

Validation state logic should use interface types #696