Moved some data location types.