Added rest to restructure