Added client class and empty classes for JSON import