Added Triggers and Context Menu