Added a few extra parse fields