Moved to open-ended kwargs for fields for future proofing