CFY-1850 start refactoring to allow per handler configuration