Split APIs to separate classes
Split APIs to separate classes