Adding MapDB impl.  Minor moves.