Fixed hard dependencies