Eclipse/Sisu migration