Commit before changing Communicator class to not have so many queues