Added support for BMP