Simplified Codecs and added BSON