Reworked dependencies