One of the other PR's @xaviershay has open utilises it to extend this.