Moved Helper to ui package
Switch to Manual Add mode before unstage