Updated according to new jDEECo