Add attbyval to invariants