Updating Mainframe to allow a callable as a matcher