Major fix: Changed way the data is stored
Major fix: Changed way the data is stored