Improved DLR handling