Update implementation to current API specification