Small changes on the client to use QueueManager methods and on the
scheduler