Added partial support for DATA and catch all OK for anything else