added some AccountManager functionality