Added oneof support and changed ParserManager to work with categories.