-from sfa.storage.model import make_record, RegRecord, RegAuthority, RegUser, RegSlice, RegKey
-from sfa.storage.alchemy import dbsession
+from sfa.storage.model import make_record, RegRecord, RegAuthority, RegUser, RegSlice, RegKey, \
+ augment_with_sfa_builtins
+### the types that we need to exclude from sqlobjects before being able to dump
+# them on the xmlrpc wire
+from sqlalchemy.orm.collections import InstrumentedList