Move account specific data out of api key data.