Feat/new api