Added debugging helpers