Refactoring necessary to support notifications on webOS