Added OneOf combinator
More work on the parsing of templates