Added and refined CSD support