Added current usage measurements