Added trim-ws