Adding more logging in the system