Fixed samples to work in response to the new refactoring on manager.queue