Add Logger & Replace System.out.println