Add whitespace trim support