Added Logger mechanism & removed unused imports