Added newtypes for token and notificationId