Hi @schlomo I will deliver this in a future pull-request as a refactoring.