Added support for resolving augmentations.