Refactoring of the commands that use PollingCommand for its new APIs