Refactoring of the Handler classes & interfaces