TrimIfExists Added