Moved composite key to PCL