Refactor dispatcher action creation