Changed structure of account entity.