Added eclim stuff