Improved logging, added extra parameters
Merge conflicts