Changes for Queue Manager implementation