Make dep more flexible