Refactoring to remove SRCommonAttributes.