Updated en_gen and related blocks