Refactoring aspectBuilder to make it more flexible for when referring to multiple classes