Fix validation to use interface
Fix translation