Hello, I noticed in this patch, exactly the same lines are added in all the functions; wouldn't it be better to add a(n) (inline) function isComponentEnabled(rec,package) to reduce the repetition? HTH, Joris