Added Primal and Usage classes