Added avatar class to helper