Added logging implementation