Reworked deps