Added convenience methods to routine and handler to return class being searched