Improve structure for new service + format message for safari notification