Don't register Avatars in token global array + place avatars in local context