Removing dependency on EMDK for Notification