Added logging features