Better debug support