Switching to cds for libs