Add basic setup to support seperate commands.