Fixes in data structure in MongoDB