Experimental (for use with cd-store)