Working on API Class