Added final touches to package listener