Vishal - Added templating to response body