Improves BWT support