Feature/api change