Package and Logs optimization