Use Map instead of Keyword also in case of bson buffer