Add bitmap support