Made some package protected members as public