Improving Measurement of Productivity in Higher Education