Updating to the new structure