Add more fields

Tested with runner on Ubuntu box and all new fields work