Worked on mcserve templating