TK-118172 Updated all places the datastore was being called