Refactored ResultSet component