Changes required to support planning/measurement plugin