#45: Add additional form fields

Resolves #45.