Updates for new structure