Saercnap/api version detect

Restored here.