Refactor DrawBuffer from map