Add more debug option