Add a little more bookkeeping info