Updated API for Account