Added trap support via REST