Changed the struct fields so they are exportable