Support 'primary_key' and 'doc' arguments