Removed ExtraDataValidator