Refactoring the handle table