DataStore refactor in progress