Added missing triggers and notification calls