Changes imposed by jDEECo refactoring