Added measurement service