Add support for the analysis API