Updated to reflect structure change.