Feature/added api functionality