XD-1583: Add BSON support