Improve coreapi metadata