Use new extend function, fix extra space in toss response, move list to new plugin