Structural changes for Eclipse;