Changes to support notifications