Did some more DBMS work