Add in BMP support