Added templates parsing