Add back UMS support