@b10n1k Can we also please tidy up the indentation in your changes here? It breaks code-folding in text editors and makes debugging validation errors like this more difficult. Thanks.