Added CUSTOM_NOTIFICATION

This change is to handle CUSTOM_NOTIFICATION