Change imports, added logger