Also move primary key out of extension category