Added pattern matching in notify_wrap to check that all bases covered