Changed visibility of data to allow proper serialization