Triggers and reports improvements