Update implementation of new API
Minor corrections in API