Improve Account example