Refactor following Thelia2 Condition module refactor