Improve package