Party handler and command modifications