Added support for metric api demo