Added some classes to support real data from JSON