Further work towards frontend generator