Initial changes to the package