Extending CBS to efficiently solve MAPFW