Debug wrapper added