Working on moduleStorage class