Added support for aspects