Add DebugUtility and other minor changes