Added more SVX and STS handling.