Add extra variables to most commands