Push notifications refactoring