implemented extra fields
Merge branch 'thijspc'