Added Data and Config classes