Refactored due to changes in package name of EMM-utils bundle.