Improve packages