More Support With Data Space