Added feature toggle for Ad Hoc Analysis tool