Added templating to shell commands