Improved generation tempate > added query params, headers and path params