Add necessary changes for Eclipse