Added eclipse compatibility