Added DBO notifications, cleanedup