Modify logging implementation