Changes to support D4U target in app