More refactorings to hold Droid events