[WIP] Jm/non static api