Updated validator to recognise new features