Improved logging, added module