Better support for Headless driver