[BACKLOG-872] Restructure Data Access to allow for deterministic build