Externalize handlers