Feature/mchanga api changes