Reworked structure.