#24

7 files changed, 419 insertions, 324 deletions

diff --git a/nejdb/Ejdb.SON/BSON.cs b/nejdb/Ejdb.SON/BSON.cs
index 3abbc98..daf47b5 100644
--- a/nejdb/Ejdb.SON/BSON.cs
+++ b/nejdb/Ejdb.SON/BSON.cs
@@ -14,12 +14,6 @@
 //   Boston, MA 02111-1307 USA.
 // ============================================================================================
 using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections;
-using System.Text;
-using System.Diagnostics;
-using System.Linq;
 
 namespace Ejdb.SON {
 
@@ -37,320 +31,5 @@ namespace Ejdb.SON {
 		/// </summary>
 		public static DateTime Epoch { get; private set; }
 	}
-
-	/// <summary>
-	/// BSON field value.
-	/// </summary>
-	[Serializable]
-	public sealed class BSONValue : IBSONValue {	
-
-		/// <summary>
-		/// BSON.Type
-		/// </summary>
-		public BSONType BSONType { get; internal set; }
-
-		/// <summary>
-		/// BSON field key.
-		/// </summary>
-		public string Key { get; internal set; }
-
-		/// <summary>
-		/// Deserialized BSON field value.
-		/// </summary>
-		public object Value { get; internal set; }
-
-		public BSONValue(BSONType type, string key, object value) {
-			this.BSONType = type;
-			this.Key = key;
-			this.Value = value;
-		}
-
-		public BSONValue(BSONType type, string key) : this(type, key, null) {
-		}
-	}
-
-	/// <summary>
-	/// BSON document deserialized data wrapper.
-	/// </summary>
-	[Serializable]
-	public sealed class BSONDocument : IBSONValue {
-		Dictionary<string, BSONValue> _fields;
-		readonly List<BSONValue> _fieldslist;
-		readonly BSONType _type;
-
-		public BSONDocument() {
-			this._fields = null;
-			this._fieldslist = new List<BSONValue>();
-		}
-
-		public BSONType BSONType {
-			get {
-				throw new NotImplementedException();
-			}
-		}
-
-		public BSONDocument Add(BSONValue bv) {
-			_fieldslist.Add(bv);
-			if (_fields != null) {
-				_fields.Add(bv.Key, bv);
-			}
-			return this;
-		}
-
-		public BSONValue this[string key] {
-			get { 
-				return GetBSONValue(key);
-			}
-			set {
-				SetBSONValue(key, value);
-			}
-		}
-
-		public BSONValue GetBSONValue(string key) {
-			CheckFields();
-			return _fields[key];
-		}
-
-		public void SetBSONValue(string key, BSONValue val) {
-			CheckFields();
-			var ov = _fields[key];
-			if (ov != null) {
-				ov.Key = val.Key;
-				ov.BSONType = val.BSONType;
-				ov.Value = val.Value;
-			} else {
-				_fieldslist.Add(val);
-				_fields[key] = val;
-			}
-		}
-
-		public object GetObjectValue(string key) {
-			CheckFields();
-			var bv = _fields[key];
-			return bv != null ? bv.Value : null;
-		}
-
-		public BSONValue SetObjectValue(string key, object value) {
-			throw new NotImplementedException();
-		}
-
-		public BSONValue DropValue(string key) {
-			var bv = this[key];
-			if (bv == null) {
-				return bv;
-			}
-			_fields.Remove(key);
-			_fieldslist.RemoveAll(x => x.Key == key);
-			return bv;
-		}
-
-		void CheckFields() {
-			if (_fields != null) {
-				return;
-			}
-			_fields = new Dictionary<string, BSONValue>(Math.Max(_fieldslist.Count + 1, 32));
-			foreach (var bv in _fieldslist) {
-				_fields.Add(bv.Key, bv);
-			}
-		}
-	}
-
-	public class BSONIterator : IDisposable {
-
-		BinaryReader _input;
-		int _doclen;
-		BSONType _ctype = BSONType.UNKNOWN;
-		string _entryKey;
-		int _entryLen;
-		bool _entryDataSkipped;
-		BSONValue _entryDataValue;
-
-		public int DocumentLength {
-			get { return this._doclen; }
-			private set { this._doclen = value; }
-		}
-
-		public BSONIterator(byte[] bbuf) : this(new MemoryStream(bbuf)) {
-		}
-
-		public BSONIterator(Stream input) {
-			if (!input.CanRead) {
-				Dispose();
-				throw new IOException("Input stream must be readable");
-			}
-			if (!input.CanSeek) {
-				Dispose();
-				throw new IOException("Input stream must be seekable");
-			}
-			this._input = new BinaryReader(input, Encoding.UTF8);
-			this._ctype = BSONType.EOO;
-			this._doclen = _input.ReadInt32();
-			if (this._doclen < 5) {
-				Dispose();
-				throw new InvalidBSONDataException("Unexpected end of BSON document");
-			}
-		}
-
-		~BSONIterator() {
-			Dispose();
-		}
-
-		public void Dispose() {
-			if (_input != null) {
-				_input.Close();
-				_input = null;
-			}
-		}
-
-		public BSONType Next() {
-			if (_ctype == BSONType.EOO) {
-				return BSONType.EOO;
-			}
-			if (_ctype != BSONType.UNKNOWN) {
-				SkipData();
-			}
-			byte bv = _input.ReadByte();
-			if (!Enum.IsDefined(typeof(BSONType), bv)) {
-				throw new InvalidBSONDataException("Unknown bson type: " + bv);
-			}
-			_entryDataSkipped = false;
-			_entryDataValue = null;
-			_entryKey = null;
-			_ctype = (BSONType) bv;
-			_entryLen = 0;
-			if (_ctype != BSONType.EOO) {
-				ReadKey();
-			}
-			switch (_ctype) {
-				case BSONType.EOO:
-					return BSONType.EOO;
-				case BSONType.UNDEFINED:
-				case BSONType.NULL:
-					_entryLen = 0;
-					break;
-				case BSONType.BOOL:
-					_entryLen = 1;
-					break;
-				case BSONType.INT:
-					_entryLen = 4;
-					break;
-				case BSONType.LONG:
-				case BSONType.DOUBLE:
-				case BSONType.TIMESTAMP:
-				case BSONType.DATE:
-					_entryLen = 8;
-					break;
-				case BSONType.OID:
-					_entryLen = 12;
-					break;	
-				case BSONType.STRING:
-				case BSONType.CODE:
-				case BSONType.SYMBOL:
-					_entryLen = 4 + _input.ReadInt32();
-					break;
-				case BSONType.DBREF:
-					_entryLen = 4 + 12 + _input.ReadInt32();
-					break;
-				case BSONType.BINDATA:
-					_entryLen = 4 + 1 + _input.ReadInt32();
-					break;
-				case BSONType.OBJECT:
-				case BSONType.ARRAY:
-				case BSONType.CODEWSCOPE:
-					_entryLen = 4 + _input.ReadInt32(); 
-					break;
-				case BSONType.REGEX:
-					_entryLen = 0;
-					break;
-				default:
-					throw new InvalidBSONDataException("Unknown entry type: " + _ctype);
-			}
-			return _ctype;
-		}
-
-		public BSONValue FetchIteratorValue() {
-			if (_entryDataSkipped) {
-				return _entryDataValue;
-			}
-			_entryDataSkipped = true;
-			switch (_ctype) {
-				case BSONType.EOO:					 
-				case BSONType.UNDEFINED:
-				case BSONType.NULL:
-					_entryDataValue = new BSONValue(_ctype, _entryKey);
-					break;	
-				case BSONType.OID:
-					Debug.Assert(_entryLen == 12);
-					_entryDataValue = new BSONValue(_ctype, _entryKey, new BSONOid(_input));
-					break;
-				case BSONType.STRING:
-				case BSONType.CODE:
-				case BSONType.SYMBOL:
-					{						
-						Debug.Assert(_entryLen - 4 >= 0);						
-						string sv = Encoding.UTF8.GetString(_input.ReadBytes(_entryLen - 4));
-						_entryDataValue = new BSONValue(_ctype, _entryKey, sv);
-						break;
-					}
-				case BSONType.BOOL:
-					_entryDataValue = new BSONValue(_ctype, _entryKey, _input.ReadBoolean());
-					break;
-				case BSONType.INT:
-					_entryDataValue = new BSONValue(_ctype, _entryKey, _input.ReadInt32());
-					break;
-				case BSONType.DOUBLE:
-					_entryDataValue = new BSONValue(_ctype, _entryKey, _input.ReadDouble());
-					break;
-				case BSONType.LONG:				
-					_entryDataValue = new BSONValue(_ctype, _entryKey, _input.ReadInt64());
-					break;			
-				case BSONType.TIMESTAMP:
-				case BSONType.DATE:
-					break;
-				
-
-
-			}
-			return _entryDataValue;
-		}
-
-		void SkipData() {
-			if (_entryDataSkipped) {
-				return;
-			}
-			_entryDataValue = null;
-			_entryDataSkipped = true;
-			if (_ctype == BSONType.REGEX) {
-				SkipCString();
-				SkipCString();
-				Debug.Assert(_entryLen == 0);
-			} else if (_entryLen > 0) {
-				long cpos = _input.BaseStream.Position;
-				if ((cpos + _entryLen) != _input.BaseStream.Seek(_entryLen, SeekOrigin.Current)) {
-					throw new IOException("Inconsitent seek within input BSON stream");
-				}
-				_entryLen = 0;
-			} 
-		}
-
-		string ReadKey() {
-			_entryKey = ReadCString();
-			return _entryKey;
-		}
-
-		string ReadCString() {
-			List<byte> sb = new List<byte>(64);
-			byte bv;
-			while ((bv = _input.ReadByte()) != 0x00) {
-				sb.Add(bv);
-			}
-			return Encoding.UTF8.GetString(sb.ToArray());
-		}
-
-		void SkipCString() {
-			while ((_input.ReadByte()) != 0x00)
-				;
-		}
-	}
 }
 
diff --git a/nejdb/Ejdb.SON/BSONArray.cs b/nejdb/Ejdb.SON/BSONArray.cs
new file mode 100644
index 0000000..dadd23b
--- /dev/null
+++ b/nejdb/Ejdb.SON/BSONArray.cs
@@ -0,0 +1,29 @@
+// ============================================================================================
+//   .NET API for EJDB database library http://ejdb.org
+//   Copyright (C) 2012-2013 Softmotions Ltd <info@softmotions.com>
+//
+//   This file is part of EJDB.
+//   EJDB is free software; you can redistribute it and/or modify it under the terms of
+//   the GNU Lesser General Public License as published by the Free Software Foundation; either
+//   version 2.1 of the License or any later version.  EJDB is distributed in the hope
+//   that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+//   License for more details.
+//   You should have received a copy of the GNU Lesser General Public License along with EJDB;
+//   if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+//   Boston, MA 02111-1307 USA.
+// ============================================================================================
+using System;
+
+namespace Ejdb.SON {
+
+	public class BSONArray : BSONObject {
+
+		public override BSONType BSONType {
+			get {
+				return BSONType.ARRAY;
+			}
+		}
+	}
+}
+
diff --git a/nejdb/Ejdb.SON/BSONIterator.cs b/nejdb/Ejdb.SON/BSONIterator.cs
new file mode 100644
index 0000000..230235c
--- /dev/null
+++ b/nejdb/Ejdb.SON/BSONIterator.cs
@@ -0,0 +1,222 @@
+// ============================================================================================
+//   .NET API for EJDB database library http://ejdb.org
+//   Copyright (C) 2012-2013 Softmotions Ltd <info@softmotions.com>
+//
+//   This file is part of EJDB.
+//   EJDB is free software; you can redistribute it and/or modify it under the terms of
+//   the GNU Lesser General Public License as published by the Free Software Foundation; either
+//   version 2.1 of the License or any later version.  EJDB is distributed in the hope
+//   that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+//   License for more details.
+//   You should have received a copy of the GNU Lesser General Public License along with EJDB;
+//   if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+//   Boston, MA 02111-1307 USA.
+// ============================================================================================
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.IO;
+
+namespace Ejdb.SON {
+
+	public class BSONIterator : IDisposable {
+
+		BinaryReader _input;
+		int _doclen;
+		BSONType _ctype = BSONType.UNKNOWN;
+		string _entryKey;
+		int _entryLen;
+		bool _entryDataSkipped;
+		BSONValue _entryDataValue;
+
+		public int DocumentLength {
+			get { return this._doclen; }
+			private set { this._doclen = value; }
+		}
+
+		public BSONIterator(byte[] bbuf) : this(new MemoryStream(bbuf)) {
+		}
+
+		public BSONIterator(Stream input) {
+			if (!input.CanRead) {
+				Dispose();
+				throw new IOException("Input stream must be readable");
+			}
+			if (!input.CanSeek) {
+				Dispose();
+				throw new IOException("Input stream must be seekable");
+			}
+			this._input = new BinaryReader(input, Encoding.UTF8);
+			this._ctype = BSONType.EOO;
+			this._doclen = _input.ReadInt32();
+			if (this._doclen < 5) {
+				Dispose();
+				throw new InvalidBSONDataException("Unexpected end of BSON document");
+			}
+		}
+
+		~BSONIterator() {
+			Dispose();
+		}
+
+		public void Dispose() {
+			if (_input != null) {
+				_input.Close();
+				_input = null;
+			}
+		}
+
+		public BSONType Next() {
+			if (_ctype == BSONType.EOO) {
+				return BSONType.EOO;
+			}
+			if (_ctype != BSONType.UNKNOWN) {
+				SkipData();
+			}
+			byte bv = _input.ReadByte();
+			if (!Enum.IsDefined(typeof(BSONType), bv)) {
+				throw new InvalidBSONDataException("Unknown bson type: " + bv);
+			}
+			_entryDataSkipped = false;
+			_entryDataValue = null;
+			_entryKey = null;
+			_ctype = (BSONType) bv;
+			_entryLen = 0;
+			if (_ctype != BSONType.EOO) {
+				ReadKey();
+			}
+			switch (_ctype) {
+				case BSONType.EOO:
+					return BSONType.EOO;
+				case BSONType.UNDEFINED:
+				case BSONType.NULL:
+					_entryLen = 0;
+					break;
+				case BSONType.BOOL:
+					_entryLen = 1;
+					break;
+				case BSONType.INT:
+					_entryLen = 4;
+					break;
+				case BSONType.LONG:
+				case BSONType.DOUBLE:
+				case BSONType.TIMESTAMP:
+				case BSONType.DATE:
+					_entryLen = 8;
+					break;
+				case BSONType.OID:
+					_entryLen = 12;
+					break;	
+				case BSONType.STRING:
+				case BSONType.CODE:
+				case BSONType.SYMBOL:
+					_entryLen = 4 + _input.ReadInt32();
+					break;
+				case BSONType.DBREF:
+					_entryLen = 4 + 12 + _input.ReadInt32();
+					break;
+				case BSONType.BINDATA:
+					_entryLen = 4 + 1 + _input.ReadInt32();
+					break;
+				case BSONType.OBJECT:
+				case BSONType.ARRAY:
+				case BSONType.CODEWSCOPE:
+					_entryLen = 4 + _input.ReadInt32(); 
+					break;
+				case BSONType.REGEX:
+					_entryLen = 0;
+					break;
+				default:
+					throw new InvalidBSONDataException("Unknown entry type: " + _ctype);
+			}
+			return _ctype;
+		}
+
+		public BSONValue FetchIteratorValue() {
+			if (_entryDataSkipped) {
+				return _entryDataValue;
+			}
+			_entryDataSkipped = true;
+			switch (_ctype) {
+				case BSONType.EOO:					 
+				case BSONType.UNDEFINED:
+				case BSONType.NULL:
+					_entryDataValue = new BSONValue(_ctype, _entryKey);
+					break;	
+				case BSONType.OID:
+					Debug.Assert(_entryLen == 12);
+					_entryDataValue = new BSONValue(_ctype, _entryKey, new BSONOid(_input));
+					break;
+				case BSONType.STRING:
+				case BSONType.CODE:
+				case BSONType.SYMBOL:
+					{						
+						Debug.Assert(_entryLen - 4 >= 0);						
+						string sv = Encoding.UTF8.GetString(_input.ReadBytes(_entryLen - 4));
+						_entryDataValue = new BSONValue(_ctype, _entryKey, sv);
+						break;
+					}
+				case BSONType.BOOL:
+					_entryDataValue = new BSONValue(_ctype, _entryKey, _input.ReadBoolean());
+					break;
+				case BSONType.INT:
+					_entryDataValue = new BSONValue(_ctype, _entryKey, _input.ReadInt32());
+					break;
+				case BSONType.DOUBLE:
+					_entryDataValue = new BSONValue(_ctype, _entryKey, _input.ReadDouble());
+					break;
+				case BSONType.LONG:				
+					_entryDataValue = new BSONValue(_ctype, _entryKey, _input.ReadInt64());
+					break;			
+				case BSONType.TIMESTAMP:
+				case BSONType.DATE:
+					break;
+
+
+
+			}
+			return _entryDataValue;
+		}
+
+		void SkipData() {
+			if (_entryDataSkipped) {
+				return;
+			}
+			_entryDataValue = null;
+			_entryDataSkipped = true;
+			if (_ctype == BSONType.REGEX) {
+				SkipCString();
+				SkipCString();
+				Debug.Assert(_entryLen == 0);
+			} else if (_entryLen > 0) {
+				long cpos = _input.BaseStream.Position;
+				if ((cpos + _entryLen) != _input.BaseStream.Seek(_entryLen, SeekOrigin.Current)) {
+					throw new IOException("Inconsitent seek within input BSON stream");
+				}
+				_entryLen = 0;
+			} 
+		}
+
+		string ReadKey() {
+			_entryKey = ReadCString();
+			return _entryKey;
+		}
+
+		string ReadCString() {
+			List<byte> sb = new List<byte>(64);
+			byte bv;
+			while ((bv = _input.ReadByte()) != 0x00) {
+				sb.Add(bv);
+			}
+			return Encoding.UTF8.GetString(sb.ToArray());
+		}
+
+		void SkipCString() {
+			while ((_input.ReadByte()) != 0x00)
+				;
+		}
+	}
+}
+
diff --git a/nejdb/Ejdb.SON/BSONObject.cs b/nejdb/Ejdb.SON/BSONObject.cs
new file mode 100644
index 0000000..7a3d890
--- /dev/null
+++ b/nejdb/Ejdb.SON/BSONObject.cs
@@ -0,0 +1,105 @@
+// ============================================================================================
+//   .NET API for EJDB database library http://ejdb.org
+//   Copyright (C) 2012-2013 Softmotions Ltd <info@softmotions.com>
+//
+//   This file is part of EJDB.
+//   EJDB is free software; you can redistribute it and/or modify it under the terms of
+//   the GNU Lesser General Public License as published by the Free Software Foundation; either
+//   version 2.1 of the License or any later version.  EJDB is distributed in the hope
+//   that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+//   License for more details.
+//   You should have received a copy of the GNU Lesser General Public License along with EJDB;
+//   if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+//   Boston, MA 02111-1307 USA.
+// ============================================================================================
+using System;
+using System.Collections.Generic;
+
+namespace Ejdb.SON {
+
+	/// <summary>
+	/// BSON document deserialized data wrapper.
+	/// </summary>
+	[Serializable]
+	public class BSONObject : IBSONValue {
+		Dictionary<string, BSONValue> _fields;
+		readonly List<BSONValue> _fieldslist;
+
+		public BSONObject() {
+			this._fields = null;
+			this._fieldslist = new List<BSONValue>();
+		}
+
+		public virtual BSONType BSONType {
+			get {
+				return BSONType.OBJECT;
+			}
+		}
+
+		public BSONObject Add(BSONValue bv) {
+			_fieldslist.Add(bv);
+			if (_fields != null) {
+				_fields.Add(bv.Key, bv);
+			}
+			return this;
+		}
+
+		public BSONValue this[string key] {
+			get { 
+				return GetBSONValue(key);
+			}
+			set {
+				SetBSONValue(key, value);
+			}
+		}
+
+		public BSONValue GetBSONValue(string key) {
+			CheckFields();
+			return _fields[key];
+		}
+
+		public void SetBSONValue(string key, BSONValue val) {
+			CheckFields();
+			var ov = _fields[key];
+			if (ov != null) {
+				ov.Key = val.Key;
+				ov.BSONType = val.BSONType;
+				ov.Value = val.Value;
+			} else {
+				_fieldslist.Add(val);
+				_fields[key] = val;
+			}
+		}
+
+		public object GetObjectValue(string key) {
+			CheckFields();
+			var bv = _fields[key];
+			return bv != null ? bv.Value : null;
+		}
+
+		public BSONValue SetObjectValue(string key, object value) {
+			throw new NotImplementedException();
+		}
+
+		public BSONValue DropValue(string key) {
+			var bv = this[key];
+			if (bv == null) {
+				return bv;
+			}
+			_fields.Remove(key);
+			_fieldslist.RemoveAll(x => x.Key == key);
+			return bv;
+		}
+
+		protected void CheckFields() {
+			if (_fields != null) {
+				return;
+			}
+			_fields = new Dictionary<string, BSONValue>(Math.Max(_fieldslist.Count + 1, 32));
+			foreach (var bv in _fieldslist) {
+				_fields.Add(bv.Key, bv);
+			}
+		}
+	}
+}
diff --git a/nejdb/Ejdb.SON/BSONValue.cs b/nejdb/Ejdb.SON/BSONValue.cs
new file mode 100644
index 0000000..6f93542
--- /dev/null
+++ b/nejdb/Ejdb.SON/BSONValue.cs
@@ -0,0 +1,51 @@
+// ============================================================================================
+//   .NET API for EJDB database library http://ejdb.org
+//   Copyright (C) 2012-2013 Softmotions Ltd <info@softmotions.com>
+//
+//   This file is part of EJDB.
+//   EJDB is free software; you can redistribute it and/or modify it under the terms of
+//   the GNU Lesser General Public License as published by the Free Software Foundation; either
+//   version 2.1 of the License or any later version.  EJDB is distributed in the hope
+//   that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+//   License for more details.
+//   You should have received a copy of the GNU Lesser General Public License along with EJDB;
+//   if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+//   Boston, MA 02111-1307 USA.
+// ============================================================================================
+using System;
+
+namespace Ejdb.SON {
+
+	/// <summary>
+	/// BSON field value.
+	/// </summary>
+	[Serializable]
+	public sealed class BSONValue : IBSONValue {	
+
+		/// <summary>
+		/// BSON.Type
+		/// </summary>
+		public BSONType BSONType { get; internal set; }
+
+		/// <summary>
+		/// BSON field key.
+		/// </summary>
+		public string Key { get; internal set; }
+
+		/// <summary>
+		/// Deserialized BSON field value.
+		/// </summary>
+		public object Value { get; internal set; }
+
+		public BSONValue(BSONType type, string key, object value) {
+			this.BSONType = type;
+			this.Key = key;
+			this.Value = value;
+		}
+
+		public BSONValue(BSONType type, string key) : this(type, key, null) {
+		}
+	}
+}
+
diff --git a/nejdb/nejdb.csproj b/nejdb/nejdb.csproj
index 190d5d1..3c2edfc 100644
--- a/nejdb/nejdb.csproj
+++ b/nejdb/nejdb.csproj
@@ -49,6 +49,10 @@
     <Compile Include="Ejdb.SON\BSONTimestamp.cs" />
     <Compile Include="Ejdb.SON\BSONRegexp.cs" />
     <Compile Include="Ejdb.SON\IBSONValue.cs" />
+    <Compile Include="Ejdb.SON\BSONValue.cs" />
+    <Compile Include="Ejdb.SON\BSONIterator.cs" />
+    <Compile Include="Ejdb.SON\BSONObject.cs" />
+    <Compile Include="Ejdb.SON\BSONArray.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/nejdb/nejdb.userprefs b/nejdb/nejdb.userprefs
index 3fff56d..0601e37 100644
--- a/nejdb/nejdb.userprefs
+++ b/nejdb/nejdb.userprefs
@@ -1,8 +1,13 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Ejdb.SON/IBSONFieldValue.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Ejdb.SON/BSONArray.cs">
     <Files>
-      <File FileName="Ejdb.SON/IBSONFieldValue.cs" Line="19" Column="2" />
+      <File FileName="Ejdb.SON/BSON.cs" Line="39" Column="3" />
+      <File FileName="Ejdb.SON/BSONValue.cs" Line="4" Column="3" />
+      <File FileName="Ejdb.SON/BSONObject.cs" Line="25" Column="2" />
+      <File FileName="Ejdb.SON/BSONIterator.cs" Line="21" Column="1" />
+      <File FileName="Ejdb.SON/BSONArray.cs" Line="22" Column="29" />
+      <File FileName="Ejdb.SON/BSONTimestamp.cs" Line="8" Column="67" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
@@ -12,7 +17,7 @@
             <Node name="References" expanded="True" />
             <Node name="Ejdb.DB" expanded="True" />
             <Node name="Ejdb.SON" expanded="True">
-              <Node name="IBSONFieldValue.cs" selected="True" />
+              <Node name="BSONArray.cs" selected="True" />
             </Node>
             <Node name="Ejdb.Tests" expanded="True" />
           </Node>