Refactored an aspect weaver part on global level.