DataController added changes