Added comments and notifications