Reworked command invocation.