dbap changes and omni hack