Debug infrastructure added