Changes for Eclipse integration