Better avatar handling