An Enhanced Pfafstetter Catchment Reference System