Add package-ready stuff