Added support for bitmaps