Make dependencies optional