Add whitespace trimm support