Add Application and Client class