Added support for measure service, changed reporting period service to
use new calendar dim