Further modularisation of primary key field.
Further modularisation of primary key field.

--HG--
extra : signature : gnupg%3AiF4EABEIAAYFAk9L/kkACgkQ/vhzUdYyyls4BgD/eWauTRh36LLIShTIU9EZByiiMF15uaetH%2B0gQRnitj4A/j6Aek4ajUK/HdoRcBGGkwg5Pgku%2Bl3qkFQJnQkBHq7n

kostko/itsy