Port more stuff to mark used attributes