Refactored the handler search method and surrounding logic to offer more handler method signatures.