Add debug support