Add effects on trap to be more generic