Add more missing fields
Remove unnecessary character set declarations