Updated to universal data return