Added metric and historical events Support