Added support for named augmentations