Some more structural changes