Make avatar class optional