Implemented a workaround to fill in unexported fields