Deps refactor