I can tackle that in a subsequent PR