Refactor and publish updates via an aspect