add explicit support for return listeners, flow listeners, confirm listeners