Upgraded eclim