Adding logging
Adding logging