Simplifying the data retrieval logic [refs #3]