Refactoring attempt to fix THUCYDIDES-121