OOP-interface improved