Collapse common attribute declarations
Added attribute to CLI to ignore drift data