Updated Model to use ResultSetBuilder