Added support to notification