Some changes in analysis module.