Make some packages optional