Adds pod module and support for json 3 and 4 schemas
Adds 'and / or' to tokens