Bringing in resultset refactoring