refactor(all) Fix interface