Added support for ApiInfo