added "avatar" support