Feature/mchanga new api