handlers: More updates for simplification