New REPO structure