Added standards validation