Mule-Commong refactor.