Add attstorage to invariants