added templating capabilities to all commands