Added debug capabilities