Updated for Eclipse artifacts