Improved backwards compatibility

To make sure old fields are being loaded correctly