Updates for Eclipse use.