Improve Account design