Adjust alchemy.analysis to new modules