Good point - thanks. I'll ask John to add those, test and re-submit.