I guess constants should be now D_XXXX