Partial refactoring of data storage throughout - breaking change