[dbs] Finish up models