Changed names. Added factories. Started extracting ResultSet constructors.