ZExt\Di: Changes in definitions