Add adapters for recently added listeners
Partially implement handlers for new listeners, add some TODOs