Refactor AspectConfiguration