Add P_Key support