Added bmp support