Changes to support packaging and distribution