Updating the analysis archtecture