Added trap1 stubs