Revert "Eliminate the use of singleton classes on CPK relations."

This reverts commit 3a5724fe3eac5595d06f4997760b6a039798f8a6.