Update for new analysis interface.