Align with pulp.spec