Made notification backward compatible