PIM-1890: Add association types