Make some dependencies optional