Better BSON support

Should fix issues with BSON support.