Modify definition of Client class and add Application class