2/3 compat file, simplify datastores