Rename and add dropTrigger