Refactor to support remote-notification and multiple URLs