re-implementing storage layers (adopting to the changed mongo)