Made the file package-friendly