Improve ResultSetMatcher