Update analysis to use new API