Added DataSource, DataTiming, Window classes