More refactoring to hold Droid events