Added whitespace support for new and update