Fixed to reflect structure changes