diff --git a/xflaim/java/xflaim/Db.java b/xflaim/java/xflaim/Db.java
index 9a2ce30..fe373e8 100644
--- a/xflaim/java/xflaim/Db.java
+++ b/xflaim/java/xflaim/Db.java
@@ -105,6 +105,12 @@ public class Db
 		_transBegin( m_this, eTransactionType, iMaxLockWait, iFlags);
 	}
 	
+	public void transBegin(
+		Db 			jdb) throws XFlaimException
+	{
+		_transBegin( m_this, jdb.m_this);
+	}
+
 	/**
 	 * Commits an existing transaction.  If no transaction is running, or the
 	 * transaction commit fails, an XFlaimException exception will be thrown.
@@ -115,6 +121,39 @@ public class Db
 		_transCommit( m_this);
 	}
 	
+	public int getTransType() throws XFlaimException
+	{
+		return( _getTransType( m_this));
+	}
+		
+	public void doCheckpoint(
+		int	iTimeout) throws XFlaimException
+	{
+		_doCheckpoint( m_this, iTimeout);
+	}
+
+	private native void _dbLock(
+		long	lThis,
+		int	iLockType,
+		int	iPriority,
+		int	iTimeout) throws XFlaimException;
+		
+	public void dbLock(
+		int	iLockType,
+		int	iPriority,
+		int	iTimeout) throws XFlaimException
+	{
+		_dbLock( m_this, iLockType, iPriority, iTimeout);
+	}
+	
+	private native void _dbUnlock(
+		long	lThis) throws XFlaimException;
+
+	public void dbUnlock() throws XFlaimException
+	{
+		_dbUnlock( m_this);
+	}
+		
 	/**
 	 * Aborts an existing transaction.  If no transaction is running, or the
 	 * transaction commit fails, an XFlaimException exception will be thrown.
@@ -126,6 +165,92 @@ public class Db
 		_transAbort( m_this);
 	}
 	
+	private native int _getLockType(
+		long		lThis) throws XFlaimException;
+
+	public int getLockType() throws XFlaimException
+	{
+		return( _getLockType( m_this));
+	}
+
+	private native boolean _getLockImplicit(
+		long		lThis) throws XFlaimException;
+
+	public boolean getLockImplicit() throws XFlaimException
+	{
+		return( _getLockImplicit( m_this));
+	}
+
+	private native int _getLockThreadId(
+		long		lThis,
+		int		iPriority) throws XFlaimException;
+		
+	public int getLockThreadId(
+		int	iPriority) throws XFlaimException
+	{
+		return( _getLockThreadId( m_this, iPriority));
+	}
+	
+	private native int _getLockNumExclQueued(
+		long		lThis,
+		int		iPriority) throws XFlaimException;
+		
+	public int getLockNumExclQueued(
+		int	iPriority) throws XFlaimException
+	{
+		return( _getLockNumExclQueued( m_this, iPriority));
+	}
+	
+	private native int _getLockNumSharedQueued(
+		long		lThis,
+		int		iPriority) throws XFlaimException;
+		
+	public int getLockNumSharedQueued(
+		int	iPriority) throws XFlaimException
+	{
+		return( _getLockNumSharedQueued( m_this, iPriority));
+	}
+	
+	private native int _getLockPriorityCount(
+		long		lThis,
+		int		iPriority) throws XFlaimException;
+		
+	public int getLockPriorityCount(
+		int	iPriority) throws XFlaimException
+	{
+		return( _getLockPriorityCount( m_this, iPriority));
+	}
+	
+	private native void _indexSuspend(
+		long	lThis,
+		int	iIndex) throws XFlaimException;
+
+	public void indexSuspend(
+		int	iIndex) throws XFlaimException
+	{
+		_indexSuspend( m_this, iIndex);
+	}
+	
+	private native void _indexResume(
+		long	lThis,
+		int	iIndex) throws XFlaimException;
+
+	public void indexResume(
+		int	iIndex) throws XFlaimException
+	{
+		_indexResume( m_this, iIndex);
+	}
+	
+	private native int _reduceSize(
+		long	lThis,
+		int	iCount) throws XFlaimException;
+
+	public int reduceSize(
+		int	iCount) throws XFlaimException
+	{
+		return( _reduceSize( m_this, iCount));
+	}
+	
 	/**
 	 * Uses the jSearchKey to retrieve the next key from the specified
 	 * index.
@@ -212,38 +337,159 @@ public class Db
 	 */
 	public DOMNode getFirstDocument(
 		int			iCollection,
-		DOMNode		jDOMNode) throws XFlaimException
+		DOMNode		ReusedNode) throws XFlaimException
 	 {
 		DOMNode		jNode = null;
-		long			lRef = 0;
+		long			lNewNodeRef = 0;
+		long			lReusedNodeRef = 0;
+		
+		if (ReusedNode != null)
+		{
+			lReusedNodeRef = ReusedNode.getRef();
+		}
 		
 		// See the comments in the DOMNode::finalize() function for an
 		// explanation of this call synchronized call
 		
 		synchronized( this)
 		{
-			lRef = _getFirstDocument( m_this, iCollection, jDOMNode);
+			lNewNodeRef = _getFirstDocument( m_this, iCollection, lReusedNodeRef);
 		}
 	
 		// If we got a reference to a native DOMNode back, let's 
 		// create a new DOMNode.
 		
-		if (lRef != 0)
+		if (lNewNodeRef != 0)
 		{
-			if (jDOMNode != null)
+			if (ReusedNode != null)
 			{
-				jDOMNode.setRef( lRef, this);
-				jNode = jDOMNode;
+				ReusedNode.setRef( lNewNodeRef, this);
+				jNode = ReusedNode;
 			}
 			else
 			{
-				jNode = new DOMNode( lRef, this);
+				jNode = new DOMNode( lNewNodeRef, this);
 			}
 		}
 			
 		return( jNode);
 	}
  
+	/**
+	 * Method to retrieve the last document in a specified collection.
+	 * @param iCollection - The collection from which to retrieve the 
+	 * last document
+	 * @param jDOMNode - If this parameter is non-null, it will be assumed
+	 * that it is no longer needed and will be rendered unusable upon
+	 * returning from this method.
+	 * @return - Returns a DOMNode which is the root node of the requested
+	 * document.
+	 * @throws XFlaimException
+	 */
+	public DOMNode getLastDocument(
+		int			iCollection,
+		DOMNode		ReusedNode) throws XFlaimException
+	 {
+		DOMNode		jNode = null;
+		long			lNewNodeRef = 0;
+		long			lReusedNodeRef = 0;
+		
+		if (ReusedNode != null)
+		{
+			lReusedNodeRef = ReusedNode.getRef();
+		}
+		
+		// See the comments in the DOMNode::finalize() function for an
+		// explanation of this call synchronized call
+		
+		synchronized( this)
+		{
+			lNewNodeRef = _getLastDocument( m_this, iCollection, lReusedNodeRef);
+		}
+	
+		// If we got a reference to a native DOMNode back, let's 
+		// create a new DOMNode.
+		
+		if (lNewNodeRef != 0)
+		{
+			if (ReusedNode != null)
+			{
+				ReusedNode.setRef( lNewNodeRef, this);
+				jNode = ReusedNode;
+			}
+			else
+			{
+				jNode = new DOMNode( lNewNodeRef, this);
+			}
+		}
+			
+		return( jNode);
+	}
+ 
+	public DOMNode getDocument(
+		int			iCollection,
+		int			iFlags,
+		long			lDocumentId,
+		DOMNode		ReusedNode) throws XFlaimException
+	 {
+		DOMNode		jNode = null;
+		long			lNewNodeRef = 0;
+		long			lReusedNodeRef = 0;
+		
+		if (ReusedNode != null)
+		{
+			lReusedNodeRef = ReusedNode.getRef();
+		}
+		
+		// See the comments in the DOMNode::finalize() function for an
+		// explanation of this call synchronized call
+		
+		synchronized( this)
+		{
+			lNewNodeRef = _getDocument( m_this, iCollection, iFlags, lDocumentId, lReusedNodeRef);
+		}
+	
+		// If we got a reference to a native DOMNode back, let's 
+		// create a new DOMNode.
+		
+		if (lNewNodeRef != 0)
+		{
+			if (ReusedNode != null)
+			{
+				ReusedNode.setRef( lNewNodeRef, this);
+				jNode = ReusedNode;
+			}
+			else
+			{
+				jNode = new DOMNode( lNewNodeRef, this);
+			}
+		}
+			
+		return( jNode);
+	}
+	
+	private native void _documentDone(
+		long			lThis,
+		int			iCollection,
+		long			lDocumentId) throws XFlaimException;
+
+	public void documentDone(
+		int			iCollection,
+		long			lDocumentId) throws XFlaimException
+	{
+		_documentDone( m_this, iCollection, lDocumentId);
+	}
+	
+	private native void _documentDone(
+		long		lThis,
+		long		lNode) throws XFlaimException;
+
+	public void _documentDone(
+		DOMNode		jDOMNode) throws XFlaimException
+	{
+		_documentDone( m_this, jDOMNode.getThis());
+	}
+	
 	/**
 	 * Creates a new element definition in the dictionary.
 	 * @param sNamespaceURI The namespace URI that this definition should be
@@ -278,7 +524,348 @@ public class Db
 		
 		return( iNewNameId);
 	}
+	
+	/**
+	 * Gets the name id for a particular element name.
+	 * @param sNamespaceURI The namespace URI for the element.
+	 * @param sElementName The name of the element.
+	 * @return Returns the name ID of the element.
+	 * @throws XFlaimException
+	 */
+	public int getElementNameId(
+		String		sNamespaceURI,
+		String		sElementName) throws XFlaimException
+	{
+		int	iNameId;
+		
+		// See the comments in the DOMNode::finalize() function for an
+		// explanation of this call synchronized call
+		
+		synchronized( this)
+		{
+			iNameId = _getElementNameId( m_this, sNamespaceURI,
+											sElementName);
+		}
+		
+		return( iNameId);
+	}
+	
+	public int createUniqueElmDef(
+		String		sNamespaceURI,
+		String		sElementName,
+		int			iRequestedId) throws XFlaimException
+		
+	{
+		int	iNewNameId;
+		
+		// See the comments in the DOMNode::finalize() function for an
+		// explanation of this call synchronized call
+		
+		synchronized( this)
+		{
+			iNewNameId = _createUniqueElmDef( m_this, sNamespaceURI,
+											sElementName, iRequestedId);
+		}
+		
+		return( iNewNameId);
+	}
+	
+	/**
+	 * Creates a new attribute definition in the dictionary.
+	 * @param sNamespaceURI The namespace URI that this definition should be
+	 * created in.  If null, the default namespace will be used.
+	 * @param sAttributeName The name of the attribute.
+	 * @param iDataType The type of node this definition will represent.
+	 * Should be one of the constants listed in
+	 * {@link xflaim.FlmDataType FlmDataType}.
+	 * @param iRequestedId If non-zero, then xflaim will try to use this
+	 * number as the name ID of the new definition.
+	 * @return Returns the name ID of the new definition.
+	 * @throws XFlaimException
+	 */
+	public int createAttributeDef(
+		String		sNamespaceURI,
+		String		sAttributeName,
+		int			iDataType,
+		int			iRequestedId) throws XFlaimException
+		
+	{
+		int	iNewNameId;
+		
+		// See the comments in the DOMNode::finalize() function for an
+		// explanation of this call synchronized call
+		
+		synchronized( this)
+		{
+			iNewNameId = _createAttributeDef( m_this, sNamespaceURI,
+											sAttributeName, iDataType,
+											iRequestedId);
+		}
+		
+		return( iNewNameId);
+	}
 
+	/**
+	 * Gets the name id for a particular attribute name.
+	 * @param sNamespaceURI The namespace URI for the attribute.
+	 * @param sAttributeName The name of the attribute.
+	 * @return Returns the name ID of the attribute.
+	 * @throws XFlaimException
+	 */
+	public int getAttributeNameId(
+		String		sNamespaceURI,
+		String		sAttributeName) throws XFlaimException
+	{
+		int	iNameId;
+		
+		// See the comments in the DOMNode::finalize() function for an
+		// explanation of this call synchronized call
+		
+		synchronized( this)
+		{
+			iNameId = _getAttributeNameId( m_this, sNamespaceURI,
+											sAttributeName);
+		}
+		
+		return( iNameId);
+	}
+	
+	/**
+	 * Creates a new prefix definition in the dictionary.
+	 * @param sPrefixName The name of the prefix.
+	 * @param iRequestedId If non-zero, then xflaim will try to use this
+	 * number as the name ID of the new definition.
+	 * @return Returns the name ID of the new definition.
+	 * @throws XFlaimException
+	 */
+	public int createPrefixDef(
+		String		sPrefixName,
+		int			iRequestedId) throws XFlaimException
+		
+	{
+		int	iNewNameId;
+		
+		// See the comments in the DOMNode::finalize() function for an
+		// explanation of this call synchronized call
+		
+		synchronized( this)
+		{
+			iNewNameId = _createPrefixDef( m_this, sPrefixName, iRequestedId);
+		}
+		
+		return( iNewNameId);
+	}
+
+	/**
+	 * Gets the name id for a particular prefix name.
+	 * @param sPrefixName The name of the prefix.
+	 * @return Returns the name ID of the prefix.
+	 * @throws XFlaimException
+	 */
+	public int getPrefixId(
+		String		sPrefixName) throws XFlaimException
+	{
+		int	iNameId;
+		
+		// See the comments in the DOMNode::finalize() function for an
+		// explanation of this call synchronized call
+		
+		synchronized( this)
+		{
+			iNameId = _getPrefixId( m_this, sPrefixName);
+		}
+		
+		return( iNameId);
+	}
+	
+	/**
+	 * Creates a new encryption definition in the dictionary.
+	 * @param sEncType Type of encryption key.
+	 * @param sEncName The name of the encryption definition.
+	 * @param iKeySize Size of the encryption key.
+	 * @param iRequestedId If non-zero, then xflaim will try to use this
+	 * number as the name ID of the new definition.
+	 * @return Returns the name ID of the new definition.
+	 * @throws XFlaimException
+	 */
+	public int createEncDef(
+		String		sEncType,
+		String		sEncName,
+		int			iKeySize,
+		int			iRequestedId) throws XFlaimException
+		
+	{
+		int	iNewNameId;
+		
+		// See the comments in the DOMNode::finalize() function for an
+		// explanation of this call synchronized call
+		
+		synchronized( this)
+		{
+			iNewNameId = _createEncDef( m_this, sEncType, sEncName, iKeySize,
+									iRequestedId);
+		}
+		
+		return( iNewNameId);
+	}
+
+	/**
+	 * Gets the name id for a particular encryption definition name.
+	 * @param sEncName The name of the encryption definition.
+	 * @return Returns the name ID of the encryption definition.
+	 * @throws XFlaimException
+	 */
+	public int getEncDefId(
+		String		sEncName) throws XFlaimException
+	{
+		int	iNameId;
+		
+		// See the comments in the DOMNode::finalize() function for an
+		// explanation of this call synchronized call
+		
+		synchronized( this)
+		{
+			iNameId = _getEncDefId( m_this, sEncName);
+		}
+		
+		return( iNameId);
+	}
+	
+	/**
+	 * Creates a new collection in the dictionary.
+	 * @param sEncName The name of the collection.
+	 * @param iEncNumber ID of the encryption definition that should be used
+	 * to encrypt this collection.  Zero means the collection will not be encrypted.
+	 * @param iRequestedId If non-zero, then xflaim will try to use this
+	 * number as the name ID of the new definition.
+	 * @return Returns the name ID of the new definition.
+	 * @throws XFlaimException
+	 */
+	public int createCollectionDef(
+		String		sCollectionName,
+		int			iEncNumber,
+		int			iRequestedId) throws XFlaimException
+		
+	{
+		int	iNewNameId;
+		
+		// See the comments in the DOMNode::finalize() function for an
+		// explanation of this call synchronized call
+		
+		synchronized( this)
+		{
+			iNewNameId = _createCollectionDef( m_this, sCollectionName, iEncNumber,
+									iRequestedId);
+		}
+		
+		return( iNewNameId);
+	}
+
+	/**
+	 * Gets the collection number for a particular collection name.
+	 * @param sCollectionName The name of the collection.
+	 * @return Returns the number of the collection.
+	 * @throws XFlaimException
+	 */
+	public int getCollectionNumber(
+		String		sCollectionName) throws XFlaimException
+	{
+		int	iNameId;
+		
+		// See the comments in the DOMNode::finalize() function for an
+		// explanation of this call synchronized call
+		
+		synchronized( this)
+		{
+			iNameId = _getCollectionNumber( m_this, sCollectionName);
+		}
+		
+		return( iNameId);
+	}
+	
+	/**
+	 * Gets the index number for a particular index name.
+	 * @param sIndexName The name of the index.
+	 * @return Returns the number of the index.
+	 * @throws XFlaimException
+	 */
+	public int getIndexNumber(
+		String		sIndexName) throws XFlaimException
+	{
+		int	iNameId;
+		
+		// See the comments in the DOMNode::finalize() function for an
+		// explanation of this call synchronized call
+		
+		synchronized( this)
+		{
+			iNameId = _getIndexNumber( m_this, sIndexName);
+		}
+		
+		return( iNameId);
+	}
+	
+	public DOMNode getDictionaryDef(
+		int			iDictType,
+		int			iDictNumber,
+		DOMNode		ReusedNode) throws XFlaimException
+	 {
+		DOMNode		jNode = null;
+		long			lNewNodeRef = 0;
+		long			lReusedNodeRef = 0;
+		
+		if (ReusedNode != null)
+		{
+			lReusedNodeRef = ReusedNode.getRef();
+		}
+		
+		// See the comments in the DOMNode::finalize() function for an
+		// explanation of this call synchronized call
+		
+		synchronized( this)
+		{
+			lNewNodeRef = _getDictionaryDef( m_this, iDictType, iDictNumber,
+										lReusedNodeRef);
+		}
+	
+		// If we got a reference to a native DOMNode back, let's 
+		// create a new DOMNode.
+		
+		if (lNewNodeRef != 0)
+		{
+			if (ReusedNode != null)
+			{
+				ReusedNode.setRef( lNewNodeRef, this);
+				jNode = ReusedNode;
+			}
+			else
+			{
+				jNode = new DOMNode( lNewNodeRef, this);
+			}
+		}
+			
+		return( jNode);
+	}
+	
+ 	public String getDictionaryName(
+ 		int	iDictType,
+		int	iDictNumber) throws XFlaimException
+	{
+		return( _getDictionaryName( m_this, iDictType, iDictNumber));
+	}
+ 
+	public String getElementNamespace(
+		int	iDictNumber) throws XFlaimException
+	{
+		return( _getElementNamespace( m_this, iDictNumber));
+	}
+		
+	public String getAttributeNamespace(
+		int	iDictNumber) throws XFlaimException
+	{
+		return( _getAttributeNamespace( m_this, iDictNumber));
+	}
+		
 	/**
 	 * Retrieves the specified node from the specified collection
 	 * @param iCollection The collection where the node is stored.
@@ -296,8 +883,8 @@ public class Db
 		
 	{
 		long			lReusedNodeRef = 0;
+		DOMNode		NewNode = null;
 		long			lNewNodeRef = 0;
-		DOMNode		NewNode;
 		
 		if (ReusedNode != null)
 		{
@@ -312,14 +899,69 @@ public class Db
 			lNewNodeRef = _getNode( m_this, iCollection, lNodeId, lReusedNodeRef);
 		}
 		
-		if (ReusedNode == null)
+		if (lNewNodeRef != 0)
 		{
-			NewNode = new DOMNode(lNewNodeRef, this);
+			if (ReusedNode == null)
+			{
+				NewNode = new DOMNode(lNewNodeRef, this);
+			}
+			else
+			{
+				NewNode=ReusedNode;
+				NewNode.setRef( lNewNodeRef, this);
+			}
 		}
-		else
+		
+		return( NewNode);		
+	}
+
+	/**
+	 * Retrieves the specified attribute node from the specified collection
+	 * @param iCollection The collection where the attribute is stored.
+	 * @param lElementNodeId The ID number of the element node that contains
+	 * the attribute to be retrieved.
+	 * @param iAttrNameId The attribute id of the attribute to be retrieved.
+	 * @param ReusedNode Optional.  An existing instance of DOMNode who's
+	 * contents will be replaced with that of the new node.  If null, a
+	 * new instance will be allocated.
+	 * @return Returns a DOMNode representing the retrieved node.
+	 * @throws XFlaimException
+	 */
+	public DOMNode getAttribute(
+		int			iCollection,
+		long			lElementNodeId,
+		int			iAttrNameId,
+		DOMNode		ReusedNode) throws XFlaimException
+	{
+		long			lReusedNodeRef = 0;
+		long			lNewNodeRef = 0;
+		DOMNode		NewNode = null;
+		
+		if (ReusedNode != null)
 		{
-			NewNode=ReusedNode;
-			NewNode.setRef( lNewNodeRef, this);
+			lReusedNodeRef = ReusedNode.getRef();
+		}
+		
+		// See the comments in DOMNode::finalize() for an explanation
+		// of this synchronized call
+		
+		synchronized( this)
+		{
+			lNewNodeRef = _getAttribute( m_this, iCollection, lElementNodeId,
+										iAttrNameId, lReusedNodeRef);
+		}
+		
+		if (lNewNodeRef != 0)
+		{
+			if (ReusedNode == null)
+			{
+				NewNode = new DOMNode(lNewNodeRef, this);
+			}
+			else
+			{
+				NewNode=ReusedNode;
+				NewNode.setRef( lNewNodeRef, this);
+			}
 		}
 		
 		return( NewNode);		
@@ -396,74 +1038,76 @@ public class Db
 		_import( m_this, jIStream, iCollection);
 	}
 	
-	/**
-	 * Desc:
-	 */
 	private native void _release(
 		long				lThis);
 
-	/**
-	 * Desc:
-	 */
 	private native void _transBegin(
 		long				lThis,
 		int				iTransactionType,
 		int 				iMaxlockWait,
-		int 				iFlags);
+		int 				iFlags) throws XFlaimException;
 
-	/**
-	 * Desc:
-	 */
-	private native void _transCommit( long lThis);
+	private native void _transBegin(
+		long			lThis,
+		long			lSrcDb) throws XFlaimException;
+		
+	private native void _transCommit(
+		long	lThis) throws XFlaimException;
 	
-	/**
-	 * Desc:
-	 */
-	private native void _transAbort( long lThis);
+	private native void _transAbort(
+		long	lThis) throws XFlaimException;
 
-	/**
-	 * Desc:
-	 */
+	private native int _getTransType(
+		long	lThis) throws XFlaimException;
+	
+	private native void _doCheckpoint(
+		long	lThis,
+		int	iTimeout) throws XFlaimException;
+		
 	private native void _import(
 		long				lThis,
 		PosIStream		jIStream,
-		int				iCollection);
+		int				iCollection) throws XFlaimException;
 
-	/**
-	 * Desc:
-	 */
  	private native long _getFirstDocument(
  		long				lThis,
  		int				iCollection,
- 		DOMNode			jNode) throws XFlaimException;
+ 		long				lOldNodeRef) throws XFlaimException;
+ 
+ 	private native long _getLastDocument(
+ 		long				lThis,
+ 		int				iCollection,
+ 		long				lOldNodeRef) throws XFlaimException;
+ 
+ 	private native long _getDocument(
+ 		long				lThis,
+ 		int				iCollection,
+		int				iFlags,
+		long				lDocumentId,
+ 		long				lOldNodeRef) throws XFlaimException;
  
-	/**
-	 * Desc:
-	 */
  	private native long _getNode(
  		long				lThis,
  		int				iCollection,
  		long				lNodeId,
- 		long				lpOldNodeRef) throws XFlaimException;
+ 		long				lOldNodeRef) throws XFlaimException;
 
-	/**
-	 * Desc:
-	 */
+	private native long _getAttribute(
+		long			lThis,
+		int			iCollection,
+		long			lElementNodeId,
+		int			iAttrNameId,
+		long			lOldNodeRef) throws XFlaimException;
+		
 	private native long _createDocument(
 		long				lThis,
 		int				iCollection) throws XFlaimException;
 
-	/**
-	 * Desc:
-	 */
 	private native long _createRootElement(
 		long				lThis,
 		int				iCollection,
 		int				iTag) throws XFlaimException;
 		
-	/**
-	 * Desc:
-	 */
 	private native int _createElementDef(
 		long				lThis,
 		String			sNamespaceURI,
@@ -471,6 +1115,82 @@ public class Db
 		int				iDataType,
 		int				iRequestedId) throws XFlaimException;
 		
+	private native int _getElementNameId(
+		long				lThis,
+		String			sNamespaceURI,
+		String			sElementName) throws XFlaimException;
+		
+	private native int _createUniqueElmDef(
+		long				lThis,
+		String			sNamespaceURI,
+		String			sElementName,
+		int				iRequestedId) throws XFlaimException;
+		
+	private native int _createAttributeDef(
+		long				lThis,
+		String			sNamespaceURI,
+		String			sAttributeName,
+		int				iDataType,
+		int				iRequestedId) throws XFlaimException;
+		
+	private native int _getAttributeNameId(
+		long				lThis,
+		String			sNamespaceURI,
+		String			sAttributeName) throws XFlaimException;
+		
+	private native int _createPrefixDef(
+		long				lThis,
+		String			sPrefixName,
+		int				iRequestedId) throws XFlaimException;
+		
+	private native int _getPrefixId(
+		long				lThis,
+		String			sPrefixName) throws XFlaimException;
+		
+	private native int _createEncDef(
+		long				lThis,
+		String			sEncType,
+		String			sEncName,
+		int				iKeySize,
+		int				iRequestedId) throws XFlaimException;
+		
+	private native int _getEncDefId(
+		long				lThis,
+		String			sEncName) throws XFlaimException;
+		
+	private native int _createCollectionDef(
+		long				lThis,
+		String			sCollectionName,
+		int				iEncNumber,
+		int				iRequestedId) throws XFlaimException;
+		
+	private native int _getCollectionNumber(
+		long				lThis,
+		String			sCollectionName) throws XFlaimException;
+		
+	private native int _getIndexNumber(
+		long				lThis,
+		String			sIndexName) throws XFlaimException;
+		
+ 	private native long _getDictionaryDef(
+ 		long				lThis,
+ 		int				iDictType,
+		int				iDictNumber,
+ 		long				lOldNodeRef) throws XFlaimException;
+ 
+	private native String _getDictionaryName(
+		long	lThis,
+		int	iDictType,
+		int	iDictNumber) throws XFlaimException;
+		
+	private native String _getElementNamespace(
+		long	lThis,
+		int	iDictNumber) throws XFlaimException;
+		
+	private native String _getAttributeNamespace(
+		long	lThis,
+		int	iDictNumber) throws XFlaimException;
+		
 	/**
 	 * Desc:
 	 */
@@ -489,8 +1209,183 @@ public class Db
 		int				iIndex,
 		long				lKey,
 		int				iFlags,
-		long				lFoundKey);
+		long				lFoundKey) throws XFlaimException;
  
 	long 					m_this;
 	private DbSystem 	m_dbSystem;
 }
+
+/*
+
+LIST OF METHODS NOT YET IMPLEMENTED
+
+		virtual RCODE FLMAPI indexStatus(
+			FLMUINT					uiIndexNum,
+			XFLM_INDEX_STATUS *	pIndexStatus) = 0;
+
+		virtual RCODE FLMAPI indexGetNext(
+			FLMUINT *				puiIndexNum) = 0;
+
+		virtual RCODE FLMAPI enableEncryption( void) = 0;
+
+		virtual RCODE FLMAPI wrapKey(
+			const char *	pszPassword = NULL) = 0;
+		
+		virtual RCODE FLMAPI rollOverDbKey( void) = 0;
+			
+		virtual RCODE FLMAPI changeItemState(
+			FLMUINT					uiDictType,
+			FLMUINT					uiDictNum,
+			const char *			pszState) = 0;
+
+		virtual RCODE FLMAPI upgrade(
+			IF_UpgradeClient *	pUpgradeClient) = 0;
+			
+//here
+
+		virtual RCODE FLMAPI getDataType(
+			FLMUINT					uiDictType,
+			FLMUINT					uiNameId,
+			FLMUINT *				puiDataType) = 0;
+
+		virtual void FLMAPI getRflFileName(
+			FLMUINT					uiFileNum,
+			FLMBOOL					bBaseOnly,
+			char *					pszFileName,
+			FLMUINT *				puiFileNameBufSize,
+			FLMBOOL *				pbNameTruncated = NULL) = 0;
+
+		virtual RCODE FLMAPI import(
+			IF_IStream *			pIStream,
+			FLMUINT					uiCollection,
+			IF_DOMNode *			pNodeToLinkTo = NULL,
+			eNodeInsertLoc			eInsertLoc = XFLM_LAST_CHILD,
+			XFLM_IMPORT_STATS *	pImportStats = NULL) = 0;
+
+		virtual RCODE FLMAPI importDocument(
+			IF_IStream *			ifpStream,
+			FLMUINT					uiCollection,
+			IF_DOMNode **			ppDocumentNode = NULL,
+			XFLM_IMPORT_STATS *	pImportStats = NULL) = 0;
+
+		virtual RCODE FLMAPI exportXML(
+			IF_DOMNode *			pStartNode,
+			IF_OStream *			pOStream,
+			eExportFormatType		eFormat = XFLM_EXPORT_INDENT) = 0;
+			
+		virtual RCODE FLMAPI setNextNodeId(
+			FLMUINT					uiCollection,
+			FLMUINT64				ui64NextNodeId) = 0;
+
+		virtual RCODE FLMAPI setNextDictNum(
+			FLMUINT					uiDictType,
+			FLMUINT					uiDictNumber) = 0;
+
+		// Configuration "set" and "get" methods
+
+		virtual RCODE FLMAPI setRflKeepFilesFlag(
+			FLMBOOL					bKeep) = 0;
+
+		virtual RCODE FLMAPI getRflKeepFlag(
+			FLMBOOL *				pbKeep) = 0;
+
+		virtual RCODE FLMAPI setRflDir(
+			const char *			pszNewRflDir) = 0;
+
+		virtual void FLMAPI getRflDir(
+			char *					pszRflDir) = 0;
+
+		virtual RCODE FLMAPI getRflFileNum(
+			FLMUINT *				puiRflFileNum) = 0;
+
+		virtual RCODE FLMAPI getHighestNotUsedRflFileNum(
+			FLMUINT *				puiHighestNotUsedRflFileNum) = 0;
+
+		virtual RCODE FLMAPI setRflFileSizeLimits(
+			FLMUINT					uiMinRflSize,
+			FLMUINT					uiMaxRflSize) = 0;
+
+		virtual RCODE FLMAPI getRflFileSizeLimits(
+			FLMUINT *				puiRflMinFileSize,
+			FLMUINT *				puiRflMaxFileSize) = 0;
+
+		virtual RCODE FLMAPI rflRollToNextFile( void) = 0;
+
+		virtual RCODE FLMAPI setKeepAbortedTransInRflFlag(
+			FLMBOOL					bKeep) = 0;
+
+		virtual RCODE FLMAPI getKeepAbortedTransInRflFlag(
+			FLMBOOL *				pbKeep) = 0;
+
+		virtual RCODE FLMAPI setAutoTurnOffKeepRflFlag(
+			FLMBOOL					bAutoTurnOff) = 0;
+
+		virtual RCODE FLMAPI getAutoTurnOffKeepRflFlag(
+			FLMBOOL *				pbAutoTurnOff) = 0;
+
+		virtual void FLMAPI setFileExtendSize(
+			FLMUINT					uiFileExtendSize) = 0;
+
+		virtual FLMUINT FLMAPI getFileExtendSize( void) = 0;
+
+		virtual void FLMAPI setAppData(
+			void *			pvAppData) = 0;
+
+		virtual void * FLMAPI getAppData( void) = 0;
+
+		virtual void FLMAPI setDeleteStatusObject(
+			IF_DeleteStatus *		pDeleteStatus) = 0;
+
+		virtual void FLMAPI setCommitClientObject(
+			IF_CommitClient *		pCommitClient) = 0;
+
+		virtual void FLMAPI setIndexingClientObject(
+			IF_IxClient *			pIxClient) = 0;
+
+		virtual void FLMAPI setIndexingStatusObject(
+			IF_IxStatus *			pIxStatus) = 0;
+
+		// Configuration information getting methods
+
+		virtual FLMUINT FLMAPI getDbVersion( void) = 0;
+
+		virtual FLMUINT FLMAPI getBlockSize( void) = 0;
+
+		virtual FLMUINT FLMAPI getDefaultLanguage( void) = 0;
+
+		virtual FLMUINT64 FLMAPI getTransID( void) = 0;
+
+		virtual void FLMAPI getCheckpointInfo(
+			XFLM_CHECKPOINT_INFO *	pCheckpointInfo) = 0;
+
+		virtual RCODE FLMAPI getDbControlFileName(
+			char *					pszControlFileName,
+			FLMUINT					uiControlFileBufSize) = 0;
+
+		virtual RCODE FLMAPI getLockWaiters(
+			IF_LockInfoClient *	pLockInfo) = 0;
+
+		virtual RCODE FLMAPI getLastBackupTransID(
+			FLMUINT64 *				pui64LastBackupTransID) = 0;
+
+		virtual RCODE FLMAPI getBlocksChangedSinceBackup(
+			FLMUINT *				puiBlocksChangedSinceBackup) = 0;
+
+		virtual RCODE FLMAPI getNextIncBackupSequenceNum(
+			FLMUINT *				puiNextIncBackupSequenceNum) = 0;
+
+		virtual void FLMAPI getSerialNumber(
+			char *					pucSerialNumber) = 0;
+
+		virtual RCODE FLMAPI getDiskSpaceUsage(
+			FLMUINT64 *				pui64DataSize,
+			FLMUINT64 *				pui64RollbackSize,
+			FLMUINT64 *				pui64RflSize) = 0;
+
+		virtual RCODE FLMAPI getMustCloseRC( void) = 0;
+
+		virtual RCODE FLMAPI getAbortRC( void) = 0;
+
+		virtual void FLMAPI setMustAbortTrans(
+			RCODE						rc) = 0;
+*/