Added measurement fields!