Added debugging features