Fix Struct API Exposure