rest + core changes for measurement