Commit before pubsub refactor