Add support for just complete existant commands.