Added additional options and triggers