Added CD number support.