Update handlers and adapters section