@tgbugs creating this ticket to keep track of this.
Happy to add them myself if you can point me to the terms, if not happy for you to create tickets and I'll add them too.
Thanks