Try to add nickname/displayname support