Add simple handler refactoring