Improve to handle package