Improve Primaries implementation