Various additions to prepare for a fronted