Hi Dario,This looks good to me now.Thank you for cleaning up the legacy code :)Reviewed-by: Max Staudt <max@enpas.org>