Added more debug options