Updating to ensure that required data is obtained when querying