Added some more package setup support.