Update deprecated structure