Made compatible with Eclipse