More changes to package