Feature/api improvements