Added logging
Added logging