Improved logging
Support optional author