Change to new cds function locations