Redesign №1 Independent DataSource