Refactored extensions and call handlers.