Updated internal structure