Update of API-s and engine