Update according new API