Client is now OOP based