Added support for layers and bitmaps which don't map to files directly