made changes needed for the introduction of the Debug component