Minor improvements
Added eclipse handlers