Cool, I will make the change once the other code changes are in place and we rebase this.