Improved disc support.