Changed the storage type to Account