Moved nonpublic structure to private header