Update for DJ 1.7