Updated Aspect with added utility logic required for the maven plugin.