Add loading measurer
Change to use loading measurer