Added BMP support