Move handler config to new module