Add numerical check for extra fields