Improve account module