Refactoring handlers and watching in binary