Change to take dependencies