Added logging suppot