Package improvements

...