Enforce extra fields + Add tests