Added choice of fair or non-fair queuing