Adapt queue structure