Added bitmaps plus fixed for SDK 2 beta 2+