Improve avatar generation