Updates

PublicData return class and Other updates