master: Updated fetching logic in data to be a little more flexible.