Add support for blocking sub commands