Fix validation to use interface