Change API Class to static