Updated classes to reduce JSON objects' overhead
Updated classes to reduce JSON objec overhead