Added log messages and auto-import