Fixing CLI to allow for queue information injection