OrderDecomposition now handled with events