Optional fields. Resolves #38