Fixed missing includes and added chaining of notifications