Added more patterns for traps