Update old OOP examples