Started new data container classes, added long descr