Added additional tools for debugging