Update validation to use swagger schema spec