Added metric and historical events Support
Added metric and historical events Support