Addition of the Eclipse stuff