Adding queue for templates and commands