additional PKs and FKs in config files to better align with the spec