Improved logging and added packages