Integrating DataStore/AccountManager further