Extended demo to metric api