Fit now supports all current measurements