CLI-runtime compatibiliy

Sure, it’s here