Unexported a struct and added some more information