Improve transparency support