Refactored avatar file skeleton to support custom avatars