Improved avatar saving