Update changes to remove zlog and use a generic logging solution