Refactored deps