Feature/api

We shouldn`t hardcode the class