Added more data dependencies