Some refactoring in AvatarStore class