Added extra fields (from icrowley's pull request)