removed content parser, added template parser