Added AspectJ support