Change fields to unexported