Adjust api

Adjust the api to modification in API:
In SE platform with generics were removed classes to use it.