Make more dependencies optional