Added notification tracking support