Use handler
Add tests for transparent adaption