Update for SkipAttribute removal