Rework dependencies