Feature/new api functionality