Added new Object-Oriented API