Extend eclipse support