Class Storage modifed. Some changes in main.