Add deps & use of data_master