Only add known fields and verify version validity