Changes for Eclipse plugin compatability