updated model to support account storage