Use a package as there is one now.