@charris should we still make the structure private for 1.8 to be on the safe side?