refactor handler load