changes to allow access to some struct fields from outside package