Feature/fix api