Restructured the mongo storage class