Refactoring of then templates
Repair the MatcherBuilder (error with serialisation in JsonObject)