Multiple database support.  Improved serialization