Debug Enhancement

Better support for debugging