Simplify blanks handling
Update driver arguments