Initial support for ad-hoc commands