adds User and DataStore support