Major improvements to BitmapLoader