Added class for clients and partners