Added more measurements