Add support for command variable

- Readd support for command variable to support non-standard
  installations