BitmapImage support update