Updated strategies to universal data return