Add additional fields. Closes #5