add non backward compatible intro/outro support