Further fixes for new structure