Some more parsers/adapters added