Work on including vocablulary validation into r1.1 validator