Primary keys now handled