Removed dependency on ZeroCommon