further work on Analysis framework
further work on Analysis framework