Refactoring of the CircusManager system