Fixclustering

Fixes the clustering to work with the current EntranceProcessor design.
Needs tests on cluster environment.