Plug more parts of notification framework