Adding support for bitmaps