[faz] Modernize