Update on genericon support