Attempt of API implementation
Fixes API current code