Adding todo comments about moving WithMappings method to the BaseStorage class