Made trapping optional