Add more logging features