Improved img.bi support