[Aspect] Bumping Aspect framework and updating code to support it