Fixed how data is stored