Replace deprecated get avatar functions