integrating parsing of improved template