fixed Api and Helper classes