Moved ResultSet creation to a static factory method