Changed logging mechanism