CSE-10: Stopped using private api